From: Mark A. Hershberger <mhershberger@intrahealth.org>
Date: Mon, 25 Jan 2010 05:03:35 +0000 (-0500)
Subject: merge
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8664
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=145ad3a5fd28a8d176a819e30a2ac20ff913e006;p=emacs.git

merge
---

145ad3a5fd28a8d176a819e30a2ac20ff913e006
diff --cc lisp/ChangeLog
index 17f7b55c2ef,cb53a42374f..a86cbcb5a56
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,10 -1,8 +1,15 @@@
- 2010-01-24  Mark A. Hershberger  <mah@everybody.org>
++2010-01-25  Mark A. Hershberger  <mah@everybody.org>
 +
 +	* progmodes/python.el: Replace reference to obsolete
 +	c-subward-mode.
 +
 +	* vc-bzr.el: (vc-bzr-revision-table) New function.
 +
+ 2010-01-25  Eric Hanchrow  <eric.hanchrow@gmail.com>  (tiny change)
+ 
+ 	* vc-git.el (vc-git-dir-status-goto-stage): Pass --relative to the
+ 	diff-index command.  This requires at least git-1.5.5.  (Bug#1589).
+ 
  2010-01-24  Dan Nicolaescu  <dann@ics.uci.edu>
  
  	Remove support for adding --signoff on commit.